Merge #7861 in 2.8 #7879
Closed
Merge #7861 in 2.8 #7879
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* The `url` option was added in version 2.3.10 of the SwiftmailerBundle (see symfony/swiftmailer-bundle#118). * The `timeout` and `source_ip` options are part of SwiftmailerBundle since symfony/swiftmailer-bundle#14 which was part of the 2.1.0 release. * The `local_domain` option was first included in the 2.4.0 release (see symfony/swiftmailer-bundle#141).
This PR was merged into the 2.7 branch. Discussion ---------- add labels for old headlines We used to have them in the past (see symfony/demo#547). Commits ------- 7dbf4c5 add labels for old headlines
…kiwi, javiereguiluz, xabbuh) This PR was merged into the 2.7 branch. Discussion ---------- Backport symfony#7510 for the Symfony 2.7 docs All the documented options are part of SwiftmailerBundle releases that are compatible with Symfony 2.7. Commits ------- 1c39991 fix versionadded directives 8eaccef Removed "encryption" and "auth_mode" from the list of %env()% compatible options 3395258 Fixed ... again ... the versionadded directives 3333723 Added the missing "versionadded" directives 0e2853a add mail transport as deprecated 2bd1a22 Minor tweaks b161bd8 update swiftmailer reference
…ilhemN) This PR was merged into the 2.7 branch. Discussion ---------- Replace calls to setDefinition() by register() Using `setDefinition` is very verbose and actually less readable imo, so I think we should push using `ContainerBuilder::register()`. Commits ------- 879347c Replace calls to setDefinition() by register()
|
Thanks for the heads up @GuilhemN. But basically I just did not merge up the |
|
Ok it was just to help you resolving the conflicts but you did well without it, thanks :) |
|
Luckily it was not too hard. :) But again, thank you for the effort you put into making it easier. :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix conflicts of #7861 when merged in 2.8.